From: Alan Mackenzie Date: Wed, 18 Jan 2012 11:50:27 +0000 (+0000) Subject: Merge from trunk. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1156^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3981fa979cb8fd47849e67b0dd3a50efe249d397;p=emacs.git Merge from trunk. --- 3981fa979cb8fd47849e67b0dd3a50efe249d397